From: Raspbian automatic forward porter <root@raspbian.org>
Date: Wed, 18 Mar 2026 05:28:46 +0000 (+0000)
Subject: Merge version 2.12-9+rpi1 and 2.12-9+deb13u1 to produce 2.12-9+rpi1+deb13u1
X-Git-Tag: archive/raspbian/2.12-9+rpi1+deb13u1^0
X-Git-Url: https://dgit.raspbian.org/%22http:/www.example.com/%22mailto:sonu.itbhu%40googlemail.com//%22mailto:i18n-csb%40linuxcsb.org/%22/%22http:/www.example.com/%22mailto:sonu.itbhu%40googlemail.com/%22mailto:i18n-csb%40linuxcsb.org/%22?a=commitdiff_plain;h=16a0c74b2964a5bd69516757e1cdead7a67da6f6;p=grub2.git

Merge version 2.12-9+rpi1 and 2.12-9+deb13u1 to produce 2.12-9+rpi1+deb13u1
---

16a0c74b2964a5bd69516757e1cdead7a67da6f6
diff --cc debian/changelog
index fef8746,ef1f711..c172cc7
--- a/debian/changelog
+++ b/debian/changelog
@@@ -1,11 -1,10 +1,19 @@@
- grub2 (2.12-9+rpi1) trixie-staging; urgency=medium
++grub2 (2.12-9+rpi1+deb13u1) trixie-staging; urgency=medium
 +
 +  [changes brought forward from 2.12-5+rpi1 by Peter Michael Green <plugwash@raspbian.org> at Sun, 28 Jul 2024 22:42:11 +0000]
 +  * Treat system as Debian, since we don't have any specific config for
 +    raspbian.
 +  * Fix clean target.
 +
-  -- Raspbian forward porter <root@raspbian.org>  Fri, 01 Aug 2025 21:11:36 +0000
++ -- Raspbian forward porter <root@raspbian.org>  Wed, 18 Mar 2026 05:28:46 +0000
++
+ grub2 (2.12-9+deb13u1) trixie; urgency=medium
+ 
+   * Non-maintainer upload.
+   * Apply patch from upstream to fix zfs root identification when generating
+     configure files (Closes: #848945)
+ 
+  -- Miao Wang <shankerwangmiao@gmail.com>  Sun, 15 Feb 2026 13:50:20 +0000
  
  grub2 (2.12-9) unstable; urgency=medium